remove g_return_if_fail.

Fri Dec  7 23:42:50 2001  Jonathan Blandford  <jrb@webwynk.net>

	* gtk/gtktreeview.c (validate_rows_handler): remove
	g_return_if_fail.

	* gtk/gtktreeview.c (validate_visible_area): Patch from Manish
	Singh <yosh@gimp.org> to fix bug when rendering Tree with an
	empty model.

diff --git a/ChangeLog b/ChangeLog
index 1d1223036cc2d78cd53417c4926b510890ed12f4..1bc35bb53ac3c804512053ab4460a553442252c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Dec  7 23:42:50 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtktreeview.c (validate_rows_handler): remove
+       g_return_if_fail.
+
+       * gtk/gtktreeview.c (validate_visible_area): Patch from Manish
+       Singh <yosh@gimp.org> to fix bug when rendering Tree with an
+       empty model.
+
 Fri Dec  7 20:06:14 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (validate_visible_area): get logic right,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1d1223036cc2d78cd53417c4926b510890ed12f4..1bc35bb53ac3c804512053ab4460a553442252c6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Fri Dec  7 23:42:50 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtktreeview.c (validate_rows_handler): remove
+       g_return_if_fail.
+
+       * gtk/gtktreeview.c (validate_visible_area): Patch from Manish
+       Singh <yosh@gimp.org> to fix bug when rendering Tree with an
+       empty model.
+
 Fri Dec  7 20:06:14 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (validate_visible_area): get logic right,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1d1223036cc2d78cd53417c4926b510890ed12f4..1bc35bb53ac3c804512053ab4460a553442252c6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Fri Dec  7 23:42:50 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtktreeview.c (validate_rows_handler): remove
+       g_return_if_fail.
+
+       * gtk/gtktreeview.c (validate_visible_area): Patch from Manish
+       Singh <yosh@gimp.org> to fix bug when rendering Tree with an
+       empty model.
+
 Fri Dec  7 20:06:14 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (validate_visible_area): get logic right,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1d1223036cc2d78cd53417c4926b510890ed12f4..1bc35bb53ac3c804512053ab4460a553442252c6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Fri Dec  7 23:42:50 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtktreeview.c (validate_rows_handler): remove
+       g_return_if_fail.
+
+       * gtk/gtktreeview.c (validate_visible_area): Patch from Manish
+       Singh <yosh@gimp.org> to fix bug when rendering Tree with an
+       empty model.
+
 Fri Dec  7 20:06:14 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (validate_visible_area): get logic right,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1d1223036cc2d78cd53417c4926b510890ed12f4..1bc35bb53ac3c804512053ab4460a553442252c6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Fri Dec  7 23:42:50 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtktreeview.c (validate_rows_handler): remove
+       g_return_if_fail.
+
+       * gtk/gtktreeview.c (validate_visible_area): Patch from Manish
+       Singh <yosh@gimp.org> to fix bug when rendering Tree with an
+       empty model.
+
 Fri Dec  7 20:06:14 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (validate_visible_area): get logic right,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1d1223036cc2d78cd53417c4926b510890ed12f4..1bc35bb53ac3c804512053ab4460a553442252c6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Fri Dec  7 23:42:50 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtktreeview.c (validate_rows_handler): remove
+       g_return_if_fail.
+
+       * gtk/gtktreeview.c (validate_visible_area): Patch from Manish
+       Singh <yosh@gimp.org> to fix bug when rendering Tree with an
+       empty model.
+
 Fri Dec  7 20:06:14 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (validate_visible_area): get logic right,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1d1223036cc2d78cd53417c4926b510890ed12f4..1bc35bb53ac3c804512053ab4460a553442252c6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Fri Dec  7 23:42:50 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtktreeview.c (validate_rows_handler): remove
+       g_return_if_fail.
+
+       * gtk/gtktreeview.c (validate_visible_area): Patch from Manish
+       Singh <yosh@gimp.org> to fix bug when rendering Tree with an
+       empty model.
+
 Fri Dec  7 20:06:14 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (validate_visible_area): get logic right,

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index ecf3e6b39351d41d1fd57b16b3404bf4faacdf5f..af9eef76416d88515aa41167b002943a4607dca5 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1512,6 +1512,8 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget)
       else
        {
          real_requested_width = column->requested_width;
+         if (real_requested_width < 0)
+           real_requested_width = 0;
        }
 
       if (column->min_width != -1)
@@ -3222,8 +3224,6 @@ validate_visible_area (GtkTreeView *tree_view)
   gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
   do
     {
-      gint old_height;
-
       if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) ||
          GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID))
        {
@@ -3310,10 +3310,12 @@ validate_rows_handler (GtkTreeView *tree_view)
   GtkTreeIter iter;
   gint i = 0;
   g_assert (tree_view);
-  g_return_val_if_fail (tree_view->priv->tree != NULL, FALSE);
 
   GDK_THREADS_ENTER ();
 
+  if (tree_view->priv->tree == NULL)
+    return FALSE;
+
   do
     {